remove unused variable.

Thu Jun 16 15:33:42 2005  Manish Singh  <yosh@gimp.org>

        * gdk/x11/gdkcursor-x11.c (update_cursor): remove unused variable.

        * gdk/x11/gdkwindow-x11.c (_gdk_x11_window_get_cursor): use
        g_return_val_if_fail.

        * gtk/gtkdnd.c (gtk_drag_get_cursor): initialize hot_x and hot_y
        for all cases.

        * gtk/gtkfilechooserdefault.c (button_new): gtk_button_set_image
        takes a GtkWidget, not a GtkImage.

diff --git a/ChangeLog b/ChangeLog
index 22eb1eddb6091260721d59ed397e4a8fa4ea8b40..939a1d142cdb5ae2b47e2e90268a1e3cde270115 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Thu Jun 16 15:33:42 2005  Manish Singh  <yosh@gimp.org>
+
+       * gdk/x11/gdkcursor-x11.c (update_cursor): remove unused variable.
+
+       * gdk/x11/gdkwindow-x11.c (_gdk_x11_window_get_cursor): use
+       g_return_val_if_fail.
+
+       * gtk/gtkdnd.c (gtk_drag_get_cursor): initialize hot_x and hot_y
+       for all cases.
+
+       * gtk/gtkfilechooserdefault.c (button_new): gtk_button_set_image
+       takes a GtkWidget, not a GtkImage.
+
 2005-06-16  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkfilechooserdefault.c (button_new): Simplify

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 22eb1eddb6091260721d59ed397e4a8fa4ea8b40..939a1d142cdb5ae2b47e2e90268a1e3cde270115 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,16 @@
+Thu Jun 16 15:33:42 2005  Manish Singh  <yosh@gimp.org>
+
+       * gdk/x11/gdkcursor-x11.c (update_cursor): remove unused variable.
+
+       * gdk/x11/gdkwindow-x11.c (_gdk_x11_window_get_cursor): use
+       g_return_val_if_fail.
+
+       * gtk/gtkdnd.c (gtk_drag_get_cursor): initialize hot_x and hot_y
+       for all cases.
+
+       * gtk/gtkfilechooserdefault.c (button_new): gtk_button_set_image
+       takes a GtkWidget, not a GtkImage.
+
 2005-06-16  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkfilechooserdefault.c (button_new): Simplify

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 22eb1eddb6091260721d59ed397e4a8fa4ea8b40..939a1d142cdb5ae2b47e2e90268a1e3cde270115 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,16 @@
+Thu Jun 16 15:33:42 2005  Manish Singh  <yosh@gimp.org>
+
+       * gdk/x11/gdkcursor-x11.c (update_cursor): remove unused variable.
+
+       * gdk/x11/gdkwindow-x11.c (_gdk_x11_window_get_cursor): use
+       g_return_val_if_fail.
+
+       * gtk/gtkdnd.c (gtk_drag_get_cursor): initialize hot_x and hot_y
+       for all cases.
+
+       * gtk/gtkfilechooserdefault.c (button_new): gtk_button_set_image
+       takes a GtkWidget, not a GtkImage.
+
 2005-06-16  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkfilechooserdefault.c (button_new): Simplify

diff --git a/gdk/x11/gdkcursor-x11.c b/gdk/x11/gdkcursor-x11.c
index 33609daf6ab8adfe25af43842e1a4c804e0363a3..ccc757ff6b8667b573cbe981f076a26da44d21b2 100644 (file)
--- a/gdk/x11/gdkcursor-x11.c
+++ b/gdk/x11/gdkcursor-x11.c
@@ -396,7 +396,6 @@ update_cursor (gpointer key,
               gpointer data)
 {
   Display *xdisplay;
-  GdkWindow *window;
   GdkCursor *cursor;
   GdkCursorPrivate *private;
   Cursor new_cursor = None;

diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 83082c02782895c6c962ed081cc616985ac46a23..04a60881125b45d09b6b9e98752fbd2e02aae9ef 100644 (file)
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -2896,7 +2896,7 @@ _gdk_x11_window_get_cursor (GdkWindow *window)
   GdkWindowObject *private;
   GdkWindowImplX11 *impl;
   
-  g_return_if_fail (GDK_IS_WINDOW (window));
+  g_return_val_if_fail (GDK_IS_WINDOW (window), NULL);
     
   private = (GdkWindowObject *)window;
   impl = GDK_WINDOW_IMPL_X11 (private->impl);

diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index 5c35b1e4655e0df74981d56c68f5fe53cf506a47..dd5ed8745ce194ff8a5778b784a61490ed926109 100644 (file)
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -593,7 +593,8 @@ gtk_drag_get_cursor (GdkDisplay        *display,
       gint width, height;
       GdkPixbuf *cursor_pixbuf, *pixbuf;
       GtkAnchorType icon_anchor;
-      gint hot_x, hot_y, icon_x, icon_y, ref_x, ref_y;
+      gint hot_x = 0, hot_y = 0;
+      gint icon_x, icon_y, ref_x, ref_y;
       gboolean found;
 
       if (info->drag_cursors[i] != NULL)
@@ -609,7 +610,6 @@ gtk_drag_get_cursor (GdkDisplay        *display,
       if (!cursor_pixbuf)
        {
          cursor_pixbuf = g_object_ref (drag_cursors[i].pixbuf);
-         hot_x = hot_y = 0;
          icon_anchor = GTK_ANCHOR_NORTH;
          icon_x = icon_y = -2;
        }

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index e22587c50a30543e30e3dc61436618b6300cc46c..202e98414719a50fed4aea6822004b464ddab209 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -1878,7 +1878,7 @@ button_new (GtkFileChooserDefault *impl,
 
   button = gtk_button_new_with_mnemonic (text);
   image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_BUTTON);
-  gtk_button_set_image (GTK_BUTTON (button), GTK_IMAGE (image));
+  gtk_button_set_image (GTK_BUTTON (button), image);
 
   gtk_widget_set_sensitive (button, sensitive);
   g_signal_connect (button, "clicked", callback, impl);